Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 Apr 2012 01:22:25 +0000 (18:22 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 Apr 2012 01:22:25 +0000 (18:22 -0700)
commitc7f49e9ec82ec9b2f4d3e83aca64decf4a0f0da9
tree5b8a55e76e9758a43357b599a30034c7d5d7e3d1
parent0a995672163129475befda1f11743efa2d0c0be1
parentc9cb3cb7bc42a19a744570eba86af00183ccb8f8
Merge from trunk.
src/ChangeLog